Remove all gtk_draw_* deprecated functions completely

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 40bafecdd28ede82111974d34a3bdcda04bbc714..835f4a62cf628da4b1cde14dfe373aa1af1f1b33 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -5774,27 +5774,6 @@ gtk_style_set_font
 gtk_style_get_style_property
 gtk_style_get_valist
 gtk_style_get
-gtk_draw_hline
-gtk_draw_vline
-gtk_draw_shadow
-gtk_draw_polygon
-gtk_draw_arrow
-gtk_draw_diamond
-gtk_draw_string
-gtk_draw_box
-gtk_draw_box_gap
-gtk_draw_check
-gtk_draw_extension
-gtk_draw_flat_box
-gtk_draw_focus
-gtk_draw_handle
-gtk_draw_option
-gtk_draw_shadow_gap
-gtk_draw_slider
-gtk_draw_tab
-gtk_draw_expander
-gtk_draw_layout
-gtk_draw_resize_grip
 gtk_paint_arrow
 gtk_paint_box
 gtk_paint_box_gap

diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml
index 22cad1176b9991c17264f6d27fcc9e32c8031d7e..ffe567106d48adebc92fd32f125b121cce262d80 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkstyle.sgml
+++ b/docs/reference/gtk/tmpl/gtkstyle.sgml
@@ -250,320 +250,6 @@ Does the same as gtk_style_apply_default_background().
 @Varargs: 
 
 
-<!-- ##### FUNCTION gtk_draw_hline ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@x1: 
-@x2: 
-@y: 
-
-
-<!-- ##### FUNCTION gtk_draw_vline ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@y1_: 
-@y2_: 
-@x: 
-
-
-<!-- ##### FUNCTION gtk_draw_shadow ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_draw_polygon ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@points: 
-@npoints: 
-@fill: 
-
-
-<!-- ##### FUNCTION gtk_draw_arrow ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@arrow_type: 
-@fill: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_draw_diamond ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_draw_string ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@x: 
-@y: 
-@string: 
-
-
-<!-- ##### FUNCTION gtk_draw_box ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_draw_box_gap ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-@gap_side: 
-@gap_x: 
-@gap_width: 
-
-
-<!-- ##### FUNCTION gtk_draw_check ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_draw_extension ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-@gap_side: 
-
-
-<!-- ##### FUNCTION gtk_draw_flat_box ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_draw_focus ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_draw_handle ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-@orientation: 
-
-
-<!-- ##### FUNCTION gtk_draw_option ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_draw_shadow_gap ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-@gap_side: 
-@gap_x: 
-@gap_width: 
-
-
-<!-- ##### FUNCTION gtk_draw_slider ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-@orientation: 
-
-
-<!-- ##### FUNCTION gtk_draw_tab ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@shadow_type: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_draw_expander ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@x: 
-@y: 
-@expander_style: 
-
-
-<!-- ##### FUNCTION gtk_draw_layout ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@use_text: 
-@x: 
-@y: 
-@layout: 
-
-
-<!-- ##### FUNCTION gtk_draw_resize_grip ##### -->
-<para>
-
-</para>
-
-@style: 
-@window: 
-@state_type: 
-@edge: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
 <!-- ##### FUNCTION gtk_paint_arrow ##### -->
 <para>
 

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index ac49234952e8cde35bfbf14f948352551da98b06..53c4711f90ba52c70df1e1f1dd45be282e6379de 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -919,68 +919,6 @@ gtk_style_lookup_color (GtkStyle   *style,
   return FALSE;
 }
 
-/**
- * gtk_draw_slider:
- * @style: a #GtkStyle
-  @window: a #GdkWindow
- * @state_type: a state
- * @shadow_type: a shadow
- * @x: the x origin of the rectangle in which to draw a slider
- * @y: the y origin of the rectangle in which to draw a slider
- * @width: the width of the rectangle in which to draw a slider
- * @height: the height of the rectangle in which to draw a slider
- * @orientation: the orientation to be used
- *
- * Draws a slider in the given rectangle on @window using the
- * given style and orientation.
- */
-void 
-gtk_draw_slider (GtkStyle      *style,
-                GdkWindow     *window,
-                GtkStateType   state_type,
-                GtkShadowType  shadow_type,
-                gint           x,
-                gint           y,
-                gint           width,
-                gint           height,
-                GtkOrientation orientation)
-{
-  g_return_if_fail (GTK_IS_STYLE (style));
-  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL);
-  
-  GTK_STYLE_GET_CLASS (style)->draw_slider (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, orientation);
-}
-
-/**
- * gtk_draw_layout:
- * @style: a #GtkStyle
- * @window: a #GdkWindow
- * @state_type: a state
- * @use_text: whether to use the text or foreground
- *            graphics context of @style
- * @x: x origin
- * @y: y origin
- * @layout: the layout to draw
- * 
- * Draws a layout on @window using the given parameters.
- */
-void
-gtk_draw_layout (GtkStyle        *style,
-                 GdkWindow       *window,
-                 GtkStateType     state_type,
-                gboolean         use_text,
-                 gint             x,
-                 gint             y,
-                 PangoLayout     *layout)
-{
-  g_return_if_fail (GTK_IS_STYLE (style));
-  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL);
-  
-  GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text,
-                                            NULL, NULL, NULL,
-                                            x, y, layout);
-}
-
 /**
  * gtk_style_set_background:
  * @style: a #GtkStyle